-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
BO : Right side block of attribute and attribute groups in combination tab not appears. #10392
Conversation
…n tab not appears.
Hello @dbadrukhiya! This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code standard
@@ -543,7 +543,7 @@ public function formAction($id, Request $request) | |||
} | |||
|
|||
$doctrine = $this->getDoctrine()->getManager(); | |||
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop(1, 1); | |||
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop((int)$languages[0]['id_lang'], (int)['shop_id']); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be:
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop((int) $languages[0]['id_lang'], (int) ['shop_id']);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 0 of 1 files reviewed, 2 unresolved discussions (waiting on @mreker and @dbadrukhiya)
src/PrestaShopBundle/Controller/Admin/ProductController.php, line 546 at r1 (raw file):
Previously, Mreker wrote…
Should be:
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop((int) $languages[0]['id_lang'], (int) ['shop_id']);
Done.
src/PrestaShopBundle/Controller/Admin/ProductController.php, line 546 at r2 (raw file):
Previously, PierreRambaud (GoT) wrote…
(int) ['shop_id']
isn't an id..
id_shop ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 0 of 1 files reviewed, 2 unresolved discussions (waiting on @mreker and @PierreRambaud)
src/PrestaShopBundle/Controller/Admin/ProductController.php, line 546 at r2 (raw file):
Previously, dbadrukhiya (Dinesh Badrukhiya) wrote…
id_shop ?
Done.
@Quetzacoalt91 wdyt? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
anything need to change? @PierreRambaud @mreker
@@ -543,7 +543,8 @@ public function formAction($id, Request $request) | |||
} | |||
|
|||
$doctrine = $this->getDoctrine()->getManager(); | |||
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop(1, 1); | |||
$language = empty($languages[0]) ? ['id_lang' => 1, 'id_shop' => 1] : $languages[0]; | |||
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop((int) $language['id_lang'], (int) ['id_shop']); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(int) ['id_shop']
is not and id.
You must read https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History this is a really good article about how to rewrite history, from rewriting a git commit, to undo a commit, or squashing commits together =) |
Thanks @PierreRambaud |
This change is